From: Keir Fraser <keir@xensource.com>
Date: Wed, 26 Sep 2007 08:15:34 +0000 (+0100)
Subject: vt-d: Fix crash on x86/32.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14937^2~18
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=8f198985116c64b6503393618e046dc0c1d0efca;p=xen.git

vt-d: Fix crash on x86/32.

On 32-bit xen, dom0 crashes when using VT-d to assign devices. It is
caused by setting m2p in clear_mmio_p2m_entry(), because
machine_to_phys_map[] entry for mmio address is not mapped.

Signed-off-by: Weidong Han <weidong.han@intel.com>
---

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index a241d7cbb3..fb0394282a 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -912,11 +912,6 @@ clear_mmio_p2m_entry(struct domain *d, unsigned long gfn)
     }
     rc = set_p2m_entry(d, gfn, _mfn(INVALID_MFN), 0);
 
-#if !defined(__x86_64__)
-    /* x86_64 xen does not map mmio entries in machine_to_phys_mapp[] */
-    set_gpfn_from_mfn(mfn, INVALID_M2P_ENTRY);
-#endif
-
     return rc;
 }